Remove some GTK_DISABLE_DEPRECATED and ENABLE_BROKEN guards

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 8a1c8cc970eb8b53c6880308c0f67ec532d4b547..39085efac805b53b0b1b0067eb90d19496bf44d4 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -31,7 +31,6 @@
 #include <gobject/gvaluecollector.h>
 #include "gtkgc.h"
 #include "gtkmarshalers.h"
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkrc.h"
 #include "gtkspinbutton.h"
 #include "gtkstyle.h"

diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 5ea2d1dffc6b9ae78c8947c0f6a340d2f079d654..ab9e267f0ce8ff3510d47f855ee0bb50f14b4cc7 100644 (file)
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -19,7 +19,6 @@
  */
 
 /* need to get the prototypes of all get_type functions */
-#define GTK_ENABLE_BROKEN
 #undef GTK_DISABLE_DEPRECATED
 /* Need to get GDK_WINDOW_OBJECT */
 #undef GDK_DISABLE_DEPRECATED

diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template
index 648b5db1d0bb2c9aec6a1a8f44b8525165b42e17..e15106e8dcc34e87f749cad63fdc4f63f38bbab1 100644 (file)
--- a/gtk/gtktypebuiltins.c.template
+++ b/gtk/gtktypebuiltins.c.template
@@ -1,6 +1,5 @@
 /*** BEGIN file-header ***/
 #undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #include "gtk.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"

diff --git a/gtk/tests/defaultvalue.c b/gtk/tests/defaultvalue.c
index 82b8d35ed2d4b58edb6b2e3c68a9c883dc1e41c1..bab518e48bf24edacee209a2f9e4177230bb8a7f 100644 (file)
--- a/gtk/tests/defaultvalue.c
+++ b/gtk/tests/defaultvalue.c
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>

diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index c1811f3a1821a9bc2b166c6145668c023983ca45..424436cd35aa63bfa80fc60847fe1e2a4be610e3 100644 (file)
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -29,8 +29,6 @@
  * - More tests!
  */
 
-#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#undef GTK_DISABLE_DEPRECATED
 #define SLEEP_DURATION  100
 
 #include "config.h"

diff --git a/gtk/tests/floating.c b/gtk/tests/floating.c
index a8206849decdf027d92fbbef6268297bca67922f..832a4dcc2efec5266021d2734cfaf219a6acb4f4 100644 (file)
--- a/gtk/tests/floating.c
+++ b/gtk/tests/floating.c
@@ -16,8 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#undef GTK_DISABLE_DEPRECATED
-#include "../gtk/gtk.h"
+#include <gtk/gtk.h>
 
 static gboolean destroyed = FALSE;
 static void

diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c
index d6cca2bdadf4dbbdf94a0a6ac3708dee52e7de11..bea1e00357f4d17bfe7833ead57d576c1d6b5754 100644 (file)
--- a/modules/other/gail/gail.c
+++ b/modules/other/gail/gail.c
@@ -22,8 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "gail.h"
 #include "gailfactory.h"

diff --git a/modules/other/gail/gailitem.c b/modules/other/gail/gailitem.c
index a5a1489c824bdafd1538f0ab2be7bd58e313fd7e..531710a72480973cbd11a3ebaa5dae07783a676c 100644 (file)
--- a/modules/other/gail/gailitem.c
+++ b/modules/other/gail/gailitem.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "gailitem.h"
 #include <libgail-util/gailmisc.h>

diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index c6d02788b9815812d38e66cd90d885c35edfee21..158a7182030ed3bedfef2d3f9d45be688be4ff41 100644 (file)
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "gaillabel.h"
 #include "gailwindow.h"

diff --git a/modules/other/gail/gailmenu.c b/modules/other/gail/gailmenu.c
index 897bfec4151a47c3cbb4de3a5b1fddc60432c020..0c559ef2d7d7dfed1566d173073d2784c8e0eabc 100644 (file)
--- a/modules/other/gail/gailmenu.c
+++ b/modules/other/gail/gailmenu.c
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gailmenu.h"
 
 static void gail_menu_class_init (GailMenuClass *klass);

diff --git a/modules/other/gail/gailtoplevel.c b/modules/other/gail/gailtoplevel.c
index 422b97f38f3165e034c369a145670a719bf5850b..afbd5b366b0834ef6f06dd15fdc6b6b197da715c 100644 (file)
--- a/modules/other/gail/gailtoplevel.c
+++ b/modules/other/gail/gailtoplevel.c
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 
 #include "gailtoplevel.h"

diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 20b557399070453b3b547df7f131d1c1170ab1e8..c92c3c6663cac3483b1b1b61406b117ee03cd8ea 100644 (file)
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>

diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index ac6e8810c888bc372c1f33532e8da0b24e330737..a4947e602026110f16cb0be1c54ecbe802aec041 100644 (file)
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 
 #include "gailwindow.h"

diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index d6754f263034c24628cdf89ea8a39af0e33ada9f..2dfa914c44f52c264369ed995c5d2caa56e36825 100644 (file)
--- a/modules/other/gail/tests/ferret.c
+++ b/modules/other/gail/tests/ferret.c
@@ -1,6 +1,4 @@
 #define MAX_BUFFER 256
-#undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #define MAX_GROUPS 20
 #define MAX_NAME_VALUE 20
 

diff --git a/modules/other/gail/tests/testcombo.c b/modules/other/gail/tests/testcombo.c
index 4598010ef11c298a72f4f77cc780473668d6ab57..f34a81257766edd9ad74ea5a100e66071e48b045 100644 (file)
--- a/modules/other/gail/tests/testcombo.c
+++ b/modules/other/gail/tests/testcombo.c
@@ -1,5 +1,3 @@
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "testlib.h"
 

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 86ad601173f1ce1c2299503bebc745cf5ca232a9..2f76cacdefd4d7cdfeb4f2f81cc89b0554e1be7b 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -39,7 +39,6 @@
 #include <unistd.h>
 #endif
 
-#define GTK_ENABLE_BROKEN
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"

diff --git a/tests/testoffscreen.c b/tests/testoffscreen.c
index 646cf7ee624f3b6ae8b398ac8b43c2a49a3a92a7..c29b67c202e497ee60bee668fa20e1369018d3c9 100644 (file)
--- a/tests/testoffscreen.c
+++ b/tests/testoffscreen.c
@@ -2,8 +2,6 @@
  * testoffscreen.c
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <math.h>
 #include <gtk/gtk.h>
 #include "gtkoffscreenbox.h"

diff --git a/tests/testselection.c b/tests/testselection.c
index 3e9419241a56d06f3cbd39ec5d7a48bd2340c97b..3af0c9fd4b71e2cd8527db068653b4acb8f6b2e9 100644 (file)
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -24,12 +24,10 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GTK_DISABLE_DEPRECATED
 
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#define GTK_ENABLE_BROKEN
 #include "gtk/gtk.h"
 
 typedef enum {

diff --git a/tests/testtext.c b/tests/testtext.c
index fcc5b834c3fff5ec7862fd7cc5168adeeb1873f2..c4019cfc401cff505c2ff7f398e5b1089a1f644a 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>